From: Jason Rumney <jasonr@gnu.org>
Date: Tue, 4 Mar 2008 17:34:22 +0000 (+0000)
Subject: Always include w32font.c in the build.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23598
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cefd56f648b24173c006309d31d99905b3706d0e;p=emacs.git

Always include w32font.c in the build.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a3e5fcd752f..00e1bc33699 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Jason Rumney  <jasonr@gnu.org>
+
+	* makefile.w32-in: Always include w32font.c in the build.
+	* w32font.c: Wrap in USE_FONT_BACKEND conditional.
+
 2008-03-04  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.in (clean): Remove emacs-*.*.* instead of emacs-*.
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 14883fc5c90..53616da300c 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -138,10 +138,7 @@ WIN32OBJ = $(BLD)/w32term.$(O)		\
 	   $(BLD)/w32reg.$(O)		\
 	   $(BLD)/w32bdf.$(O)
 
-FONTOBJ =
-ifdef USE_FONTBACKEND
 FONTOBJ = $(BLD)/w32font.$(O)
-endif
 
 LIBS =  $(TLIB0)	\
 	$(TLIB1)	\